From 9e90452bac5268aa1cf67265c2deb22b1d4c66da Mon Sep 17 00:00:00 2001
From: Stefan Kost <stefkost@src.gnome.org>
Date: Sat, 6 Sep 2008 09:47:18 +0000
Subject: [PATCH] Use xi:include instead of entities to ease maintenance and
 speed up

	* gdk-pixbuf/gdk-pixbuf-csource.xml:
	* gdk-pixbuf/gdk-pixbuf-from-drawables.sgml:
	* gdk-pixbuf/gdk-pixbuf-query-loaders.xml:
	* gdk-pixbuf/gdk-pixbuf-rendering.sgml:
	* gdk-pixbuf/gdk-pixbuf.sgml:
	* gdk-pixbuf/porting-from-imlib.sgml:
	* gdk/gdk-docs.sgml:
	* gdk/multihead.sgml:
	* libgail-util/gail-libgail-util-docs.sgml:
	  Use xi:include instead of entities to ease maintenance and speed up
	  documentation build. Fixes #540967


svn path=/trunk/; revision=21304
---
 docs/reference/ChangeLog                      |  14 ++
 .../gdk-pixbuf/gdk-pixbuf-csource.xml         |   4 +
 .../gdk-pixbuf/gdk-pixbuf-from-drawables.sgml |   4 +
 .../gdk-pixbuf/gdk-pixbuf-query-loaders.xml   |   4 +
 .../gdk-pixbuf/gdk-pixbuf-rendering.sgml      |   4 +
 docs/reference/gdk-pixbuf/gdk-pixbuf.sgml     | 113 +++++++--------
 .../gdk-pixbuf/porting-from-imlib.sgml        |   6 +
 docs/reference/gdk/gdk-docs.sgml              | 132 +++++++-----------
 docs/reference/gdk/multihead.sgml             |   4 +
 .../libgail-util/gail-libgail-util-docs.sgml  |  14 +-
 10 files changed, 154 insertions(+), 145 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 6617f9a3c5..848de72ec6 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-06  Stefan Kost  <ensonic@users.sf.net>
+
+	* gdk-pixbuf/gdk-pixbuf-csource.xml:
+	* gdk-pixbuf/gdk-pixbuf-from-drawables.sgml:
+	* gdk-pixbuf/gdk-pixbuf-query-loaders.xml:
+	* gdk-pixbuf/gdk-pixbuf-rendering.sgml:
+	* gdk-pixbuf/gdk-pixbuf.sgml:
+	* gdk-pixbuf/porting-from-imlib.sgml:
+	* gdk/gdk-docs.sgml:
+	* gdk/multihead.sgml:
+	* libgail-util/gail-libgail-util-docs.sgml:
+	  Use xi:include instead of entities to ease maintenance and speed up
+	  documentation build. Fixes #540967
+
 2008-09-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.14.1 ===
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
index 74463b1670..36a042385e 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <refentry id="gdk-pixbuf-csource">
 
 <refmeta>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
index 7679ac21e4..2d9f43ae55 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables">
 <refmeta>
 <refentrytitle>Drawables to Pixbufs</refentrytitle>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
index 576c4b6fa2..86fc866de5 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <refentry id="gdk-pixbuf-query-loaders">
 
 <refmeta>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
index 9721ed2cb9..336004c864 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <refentry id="gdk-pixbuf-gdk-pixbuf-rendering">
 <refmeta>
 <refentrytitle>Rendering</refentrytitle>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
index 6ea2ac1ed3..7bc3bc323b 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -1,35 +1,13 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY gdk-pixbuf-gdk-pixbuf SYSTEM "xml/gdk-pixbuf.xml">
-<!ENTITY gdk-pixbuf-refcounting SYSTEM "xml/refcounting.xml">
-<!ENTITY gdk-pixbuf-file-loading SYSTEM "xml/file-loading.xml">
-<!ENTITY gdk-pixbuf-file-saving SYSTEM "xml/file-saving.xml">
-<!ENTITY gdk-pixbuf-creating SYSTEM "xml/creating.xml">
-<!ENTITY gdk-pixbuf-inline SYSTEM "xml/inline.xml">
-<!ENTITY gdk-pixbuf-scaling SYSTEM "xml/scaling.xml">
-<!ENTITY gdk-pixbuf-rendering SYSTEM "gdk-pixbuf-rendering.sgml">
-<!ENTITY gdk-pixbuf-from-drawables SYSTEM "gdk-pixbuf-from-drawables.sgml">
-<!ENTITY gdk-pixbuf-util SYSTEM "xml/util.xml">
-<!ENTITY gdk-pixbuf-animation SYSTEM "xml/animation.xml">
-<!ENTITY GdkPixbufLoader SYSTEM "xml/gdk-pixbuf-loader.xml">
-<!ENTITY module-interface SYSTEM "xml/module_interface.xml">
-<!ENTITY initialization-versions SYSTEM "xml/initialization_versions.xml">
-<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-init SYSTEM "xml/gdk-pixbuf-xlib-init.xml">
-<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-rendering SYSTEM "xml/gdk-pixbuf-xlib-rendering.xml">
-<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-from-drawables SYSTEM "xml/gdk-pixbuf-xlib-from-drawables.xml">
-<!ENTITY gdk-pixbuf-gdk-pixbuf-xlib-rgb SYSTEM "xml/gdk-pixbuf-xlib-rgb.xml">
-
-<!ENTITY Porting-From-Imlib SYSTEM "porting-from-imlib.sgml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!ENTITY version SYSTEM "version.xml">
 
 <!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
 <!ENTITY Imlib "<application>Imlib</application>">
-<!ENTITY version SYSTEM "version.xml">
-<!ENTITY gdk-pixbuf-csource SYSTEM "gdk-pixbuf-csource.xml">
-<!ENTITY gdk-pixbuf-query-loaders SYSTEM "gdk-pixbuf-query-loaders.xml">
 ]>
-
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>The &gdk-pixbuf; Library</title>
     <releaseinfo>Version &version;</releaseinfo>
@@ -93,27 +71,27 @@
       </para>
     </partintro>
 
-    &initialization-versions;
-
-    &gdk-pixbuf-gdk-pixbuf;
-    &gdk-pixbuf-refcounting;
-    &gdk-pixbuf-file-loading;
-    &gdk-pixbuf-file-saving;
-    &gdk-pixbuf-creating;
-    &gdk-pixbuf-inline;
-    &gdk-pixbuf-scaling;
-    &gdk-pixbuf-rendering;
-    &gdk-pixbuf-from-drawables;
-    &gdk-pixbuf-util;
-    &gdk-pixbuf-animation;
-
-    &GdkPixbufLoader;
-    &module-interface;
-
-    &gdk-pixbuf-gdk-pixbuf-xlib-init;
-    &gdk-pixbuf-gdk-pixbuf-xlib-rendering;
-    &gdk-pixbuf-gdk-pixbuf-xlib-from-drawables;
-    &gdk-pixbuf-gdk-pixbuf-xlib-rgb;
+    <xi:include href="xml/initialization_versions.xml" />
+
+    <xi:include href="xml/gdk-pixbuf.xml" />
+    <xi:include href="xml/refcounting.xml" />
+    <xi:include href="xml/file-loading.xml" />
+    <xi:include href="xml/file-saving.xml" />
+    <xi:include href="xml/creating.xml" />
+    <xi:include href="xml/inline.xml" />
+    <xi:include href="xml/scaling.xml" />
+    <xi:include href="gdk-pixbuf-rendering.sgml" />
+    <xi:include href="gdk-pixbuf-from-drawables.sgml" />
+    <xi:include href="xml/util.xml" />
+    <xi:include href="xml/animation.xml" />
+
+    <xi:include href="xml/gdk-pixbuf-loader.xml" />
+    <xi:include href="xml/module_interface.xml" />
+
+    <xi:include href="xml/gdk-pixbuf-xlib-init.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-rendering.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-from-drawables.xml" />
+    <xi:include href="xml/gdk-pixbuf-xlib-rgb.xml" />
   </reference>
 
   <reference>
@@ -126,33 +104,50 @@
       </para>
     </partintro>
 
-    &gdk-pixbuf-csource;
-    &gdk-pixbuf-query-loaders;
+    <xi:include href="gdk-pixbuf-csource.xml" />
+    <xi:include href="gdk-pixbuf-query-loaders.xml" />
   </reference>
 
-  <index>
-    <title>Index</title>
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="deprecated">
+  <index id="api-index-deprecated" role="deprecated">
     <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.2">
+  <index id="api-index-2-2" role="2.2">
     <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.4">
+  <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.6">
+  <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.8">
+  <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <!-- -->
+  <index id="api-index-2-10" role="2.10">
+    <title>Index of new symbols in 2.10</title>
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-2-12" role="2.12">
+    <title>Index of new symbols in 2.12</title>
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.14">
+  <!-- -->
+  <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
   </index>  
 
-  &Porting-From-Imlib;
+   <xi:include href="porting-from-imlib.sgml" />
 
   <!-- License -->
 
diff --git a/docs/reference/gdk-pixbuf/porting-from-imlib.sgml b/docs/reference/gdk-pixbuf/porting-from-imlib.sgml
index 2234a711ab..003815e678 100644
--- a/docs/reference/gdk-pixbuf/porting-from-imlib.sgml
+++ b/docs/reference/gdk-pixbuf/porting-from-imlib.sgml
@@ -1,3 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
+<!ENTITY Imlib "<application>Imlib</application>">
+]>
   <appendix>
     <title>Porting applications from &Imlib; to &gdk-pixbuf;</title>
 
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index a0f24fa3ed..f297451774 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -1,41 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY gdk-General SYSTEM "xml/general.xml">
-<!ENTITY gdk-Bitmaps-and-Pixmaps SYSTEM "xml/pixmaps.xml">
-<!ENTITY gdk-Images SYSTEM "xml/images.xml">
-<!ENTITY gdk-GdkRGB SYSTEM "xml/rgb.xml">
-<!ENTITY gdk-Pixbufs SYSTEM "xml/pixbufs.xml">
-<!ENTITY gdk-Colormaps-and-Colors SYSTEM "xml/colors.xml">
-<!ENTITY gdk-Fonts SYSTEM "xml/fonts.xml">
-<!ENTITY gdk-Drawing-Primitives SYSTEM "xml/drawing.xml">
-<!ENTITY gdk-Graphics-Contexts SYSTEM "xml/gcs.xml">
-<!ENTITY gdk-Visuals SYSTEM "xml/visuals.xml">
-<!ENTITY gdk-Windows SYSTEM "xml/windows.xml">
-<!ENTITY gdk-Selections SYSTEM "xml/selections.xml">
-<!ENTITY gdk-Properties-and-Atoms SYSTEM "xml/properties.xml">
-<!ENTITY gdk-Pango-Interaction SYSTEM "xml/pango_interaction.xml">
-<!ENTITY gdk-Cairo-Interaction SYSTEM "xml/cairo_interaction.xml">
-<!ENTITY gdk-Points-Rectangles-and-Regions SYSTEM "xml/regions.xml">
-<!ENTITY gdk-Threads SYSTEM "xml/threads.xml">
-<!ENTITY gdk-Keys SYSTEM "xml/keys.xml">
-<!ENTITY gdk-Input-Devices SYSTEM "xml/input_devices.xml">
-<!ENTITY gdk-Events SYSTEM "xml/events.xml">
-<!ENTITY gdk-Event-Structures SYSTEM "xml/event_structs.xml">
-<!ENTITY gdk-Cursors SYSTEM "xml/cursors.xml">
-<!ENTITY gdk-Input SYSTEM "xml/input.xml">
-<!ENTITY gdk-Drag-and-Drop SYSTEM "xml/dnd.xml">
-<!ENTITY gdk-X-Window-System-Interaction SYSTEM "xml/x_interaction.xml">
-<!ENTITY gdk-Screen SYSTEM "xml/gdkscreen.xml">
-<!ENTITY gdk-Display SYSTEM "xml/gdkdisplay.xml">
-<!ENTITY gdk-DisplayManager SYSTEM "xml/gdkdisplaymanager.xml">
-<!ENTITY gdk-Multihead SYSTEM "multihead.sgml">
-<!ENTITY gdk-AppLaunchContext SYSTEM "xml/gdkapplaunchcontext.xml">
-<!ENTITY gdk-Testing SYSTEM "xml/gdktesting.xml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
 ]>
-
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GDK Reference Manual</title>
     <releaseinfo>for GDK &version;</releaseinfo>
@@ -43,81 +12,88 @@
 
   <reference id="reference">
     <title>API Reference</title>
-    &gdk-General;
-
-    &gdk-Multihead;
-    &gdk-Display;
-    &gdk-DisplayManager;
-    &gdk-Screen;
+    <xi:include href="xml/general.xml" />
 
-    &gdk-Points-Rectangles-and-Regions;
-    &gdk-Graphics-Contexts;
-    &gdk-Drawing-Primitives;
+    <xi:include href="multihead.sgml" />
+    <xi:include href="xml/gdkdisplay.xml" />
+    <xi:include href="xml/gdkdisplaymanager.xml" />
+    <xi:include href="xml/gdkscreen.xml" />
 
-    &gdk-Bitmaps-and-Pixmaps;
-    &gdk-GdkRGB;
-    &gdk-Images;
-    &gdk-Pixbufs;
+    <xi:include href="xml/regions.xml" />
+    <xi:include href="xml/gcs.xml" />
+    <xi:include href="xml/drawing.xml" />
 
-    &gdk-Colormaps-and-Colors;
-    &gdk-Visuals;
+    <xi:include href="xml/pixmaps.xml" />
+    <xi:include href="xml/rgb.xml" />
+    <xi:include href="xml/images.xml" />
+    <xi:include href="xml/pixbufs.xml" />
 
-    &gdk-Fonts;
-    &gdk-Cursors;
+    <xi:include href="xml/colors.xml" />
+    <xi:include href="xml/visuals.xml" />
 
-    &gdk-Windows;
+    <xi:include href="xml/fonts.xml" />
+    <xi:include href="xml/cursors.xml" />
 
-    &gdk-Events;
-    &gdk-Event-Structures;
+    <xi:include href="xml/windows.xml" />
 
-    &gdk-Keys;
+    <xi:include href="xml/events.xml" />
+    <xi:include href="xml/event_structs.xml" />
 
-    &gdk-Selections;
-    &gdk-Drag-and-Drop;
+    <xi:include href="xml/keys.xml" />
 
-    &gdk-Properties-and-Atoms;
+    <xi:include href="xml/selections.xml" />
+    <xi:include href="xml/dnd.xml" />
 
-    &gdk-Threads;
+    <xi:include href="xml/properties.xml" />
 
-    &gdk-Input;
+    <xi:include href="xml/threads.xml" />
 
-    &gdk-Input-Devices;
+    <xi:include href="xml/input.xml" />
+    <xi:include href="xml/input_devices.xml" />
 
-    &gdk-Pango-Interaction;
-    &gdk-Cairo-Interaction;
-    &gdk-X-Window-System-Interaction;
+    <xi:include href="xml/pango_interaction.xml" />
+    <xi:include href="xml/cairo_interaction.xml" />
+    <xi:include href="xml/x_interaction.xml" />
 
-    &gdk-AppLaunchContext;
+    <xi:include href="xml/gdkapplaunchcontext.xml" />
 
-    &gdk-Testing;
+    <xi:include href="xml/gdktesting.xml" />
   </reference>
 
-  <index>
-    <title>Index</title>
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="deprecated">
+  <index id="api-index-deprecated" role="deprecated">
     <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.2">
+  <index id="api-index-2-2" role="2.2">
     <title>Index of new symbols in 2.2</title>
+    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
   </index>
-  <index role="2.4">
+  <index id="api-index-2-4" role="2.4">
     <title>Index of new symbols in 2.4</title>
+    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.6">
+  <index id="api-index-2-6" role="2.6">
     <title>Index of new symbols in 2.6</title>
+    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.8">
+  <index id="api-index-2-8" role="2.8">
     <title>Index of new symbols in 2.8</title>
+    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.10">
+  <index id="api-index-2-10" role="2.10">
     <title>Index of new symbols in 2.10</title>
+    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.12">
+  <index id="api-index-2-12" role="2.12">
     <title>Index of new symbols in 2.12</title>
+    <xi:include href="xml/api-index-2.12.xml"><xi:fallback /></xi:include>
   </index>  
-  <index role="2.14">
+  <index id="api-index-2-14" role="2.14">
     <title>Index of new symbols in 2.14</title>
+    <xi:include href="xml/api-index-2.14.xml"><xi:fallback /></xi:include>
   </index>  
-
 </book>
diff --git a/docs/reference/gdk/multihead.sgml b/docs/reference/gdk/multihead.sgml
index 12b47fd072..2ac48d74c0 100644
--- a/docs/reference/gdk/multihead.sgml
+++ b/docs/reference/gdk/multihead.sgml
@@ -1,3 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
 <refentry id="multihead" revision="1 May 2002">
   <refmeta>
     <refentrytitle>Multi-head Support Overview</refentrytitle>
diff --git a/docs/reference/libgail-util/gail-libgail-util-docs.sgml b/docs/reference/libgail-util/gail-libgail-util-docs.sgml
index 97bb08be29..7aa0312554 100644
--- a/docs/reference/libgail-util/gail-libgail-util-docs.sgml
+++ b/docs/reference/libgail-util/gail-libgail-util-docs.sgml
@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY gail-libgail-util-gailtextutil SYSTEM "xml/gailtextutil.xml">
-<!ENTITY gail-libgail-util-gailmisc SYSTEM "xml/gailmisc.xml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 ]>
-
-<book>
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>GAIL Reference Manual</title>
   </bookinfo>
   <chapter id="libgail-util-main">
     <title>GAIL libgail-util Library</title>
-    &gail-libgail-util-gailtextutil;
-    &gail-libgail-util-gailmisc;
+    <xi:include href="xml/gailtextutil.xml" />
+    <xi:include href="xml/gailmisc.xml" />
   </chapter>
 </book>
-- 
2.30.2